Go back to not scaling up at all. Less magic.

2004-10-05  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkicontheme.c (icon_info_ensure_scale_and_pixbuf): Go back to
	not scaling up at all. Less magic.

diff --git a/ChangeLog b/ChangeLog
index 7bfe6975624d0d0ad8f1a67345d4d6dd0c50dea1..37b29a47d3ef34ea78e2f9396edf167efde10f20 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-05  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkicontheme.c (icon_info_ensure_scale_and_pixbuf): Go back to
+       not scaling up at all. Less magic.
+
 Tue Oct  5 17:06:26 2004  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkwidget.c (gtk_widget_size_allocate): if REQUEST_NEEDED is still

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7bfe6975624d0d0ad8f1a67345d4d6dd0c50dea1..37b29a47d3ef34ea78e2f9396edf167efde10f20 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2004-10-05  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkicontheme.c (icon_info_ensure_scale_and_pixbuf): Go back to
+       not scaling up at all. Less magic.
+
 Tue Oct  5 17:06:26 2004  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkwidget.c (gtk_widget_size_allocate): if REQUEST_NEEDED is still

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7bfe6975624d0d0ad8f1a67345d4d6dd0c50dea1..37b29a47d3ef34ea78e2f9396edf167efde10f20 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2004-10-05  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkicontheme.c (icon_info_ensure_scale_and_pixbuf): Go back to
+       not scaling up at all. Less magic.
+
 Tue Oct  5 17:06:26 2004  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkwidget.c (gtk_widget_size_allocate): if REQUEST_NEEDED is still

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7bfe6975624d0d0ad8f1a67345d4d6dd0c50dea1..37b29a47d3ef34ea78e2f9396edf167efde10f20 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2004-10-05  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkicontheme.c (icon_info_ensure_scale_and_pixbuf): Go back to
+       not scaling up at all. Less magic.
+
 Tue Oct  5 17:06:26 2004  Tim Janik  <timj@gtk.org>
 
        * gtk/gtkwidget.c (gtk_widget_size_allocate): if REQUEST_NEEDED is still

diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index f4be0e403e98cc6a78798646caca440d76b12c73..6ac490e32df4756c618f06718af35e85859ba1d8 100644 (file)
--- a/gtk/gtkicontheme.c
+++ b/gtk/gtkicontheme.c
@@ -2326,7 +2326,7 @@ icon_info_ensure_scale_and_pixbuf (GtkIconInfo *icon_info,
        icon_info->scale = 1.0;
       
       if (icon_info->dir_type == ICON_THEME_DIR_UNTHEMED)
-       icon_info->scale = MIN (icon_info->scale, 1.5);
+       icon_info->scale = MIN (icon_info->scale, 1.0);
     }
 
   /* We don't short-circuit out here for scale_only, since, now